Update package names due to so-versions changes

diff --git a/debian/control b/debian/control
index fa8619c44fe83143fa8f054c0f7bdc972f12f2e2..c75ca5882017552c7ff1602924c5eec187166f03 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -119,7 +119,7 @@ Depends: ${misc:Depends},
          libtheora-dev,
          libtiff-dev,
          libutfcpp-dev,
-         libvtk9 (= ${binary:Version}),
+         libvtk9.1 (= ${binary:Version}),
          libvtk9-java (= ${binary:Version}) [!hppa !hurd-any !kfreebsd-any],
          libx11-dev,
          libxft-dev,
@@ -135,12 +135,6 @@ Depends: ${misc:Depends},
          zlib1g-dev
 Suggests: vtk9-doc,
           vtk9-examples
-Conflicts: libvtk5-dev,
-           libvtk6-dev,
-           libvtk7-dev
-Replaces: libvtk5-dev,
-          libvtk6-dev,
-          libvtk7-dev
 Description: VTK header files
  The Visualization Toolkit (VTK) is an open-source software system
  for 3D computer graphics, image processing, and visualization.
@@ -148,7 +142,7 @@ Description: VTK header files
  This package provides the VTK header files required to compile
  C++ programs that use VTK to do 3D visualisation.
 
-Package: libvtk9
+Package: libvtk9.1
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -157,8 +151,6 @@ Depends: ${misc:Depends},
 Suggests: mpi-default-bin,
           vtk9-doc,
           vtk9-examples
-Replaces: libvtk5.8,
-          libvtk7.1
 Description: VTK libraries
  The Visualization Toolkit (VTK) is an open-source software system
  for 3D computer graphics, image processing, and visualization.
@@ -177,10 +169,6 @@ Suggests: java-virtual-machine,
           libvtk9-dev (= ${binary:Version}),
           vtk9-doc,
           vtk9-examples
-Breaks: libvtk6-java,
-        libvtk7-java
-Replaces: libvtk6-java,
-          libvtk7-java
 Description: VTK - Java language support
  The Visualization Toolkit (VTK) is an object oriented, high level
  library that allows one to easily write C++ programs, Tcl, Python and
@@ -191,7 +179,7 @@ Description: VTK - Java language support
 Package: python3-vtk9
 Architecture: any
 Section: python
-Depends: libvtk9 (= ${binary:Version}),
+Depends: libvtk9.1 (= ${binary:Version}),
          python3-mpi4py,
          ${misc:Depends},
          ${python3:Depends},
@@ -212,7 +200,7 @@ Description: Python bindings for VTK
 Package: vtk9
 Architecture: any
 Section: interpreters
-Depends: libvtk9 (= ${binary:Version}),
+Depends: libvtk9.1 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: vtk9-doc,
@@ -252,7 +240,7 @@ Description: VTK examples
  .
  This package provides examples for VTK9
 
-Package: libvtk9-qt
+Package: libvtk9.1-qt
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -270,7 +258,7 @@ Architecture: any
 Multi-Arch: same
 Section: libdevel
 Depends: libvtk9-dev (= ${binary:Version}),
-         libvtk9-qt (= ${binary:Version}),
+         libvtk9.1-qt (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
          qtbase5-dev,

diff --git a/debian/libvtk9-jni.install b/debian/libvtk9-jni.install
deleted file mode 100644 (file)
index 9476596..0000000
--- a/debian/libvtk9-jni.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/jni/

diff --git a/debian/libvtk9-qt.install b/debian/libvtk9-qt.install
deleted file mode 100644 (file)
index 4c7a2dd..0000000
--- a/debian/libvtk9-qt.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/*Qt*.so.*

diff --git a/debian/libvtk9-qt.lintian-overrides b/debian/libvtk9-qt.lintian-overrides
deleted file mode 100644 (file)
index 5c59554..0000000
--- a/debian/libvtk9-qt.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libvtk9-qt: package-name-doesnt-match-sonames

diff --git a/debian/libvtk9.1-qt.install b/debian/libvtk9.1-qt.install
new file mode 100644 (file)
index 0000000..4c7a2dd
--- /dev/null
+++ b/debian/libvtk9.1-qt.install
@@ -0,0 +1 @@
+usr/lib/*/*Qt*.so.*

diff --git a/debian/libvtk9.1-qt.lintian-overrides b/debian/libvtk9.1-qt.lintian-overrides
new file mode 100644 (file)
index 0000000..5c59554
--- /dev/null
+++ b/debian/libvtk9.1-qt.lintian-overrides
@@ -0,0 +1 @@
+libvtk9-qt: package-name-doesnt-match-sonames

diff --git a/debian/libvtk9.1.install b/debian/libvtk9.1.install
new file mode 100644 (file)
index 0000000..47de4b0
--- /dev/null
+++ b/debian/libvtk9.1.install
@@ -0,0 +1,2 @@
+usr/lib/*/*.so.*
+usr/lib/*/vtk

diff --git a/debian/libvtk9.1.lintian-overrides b/debian/libvtk9.1.lintian-overrides
new file mode 100644 (file)
index 0000000..85c26f1
--- /dev/null
+++ b/debian/libvtk9.1.lintian-overrides
@@ -0,0 +1 @@
+libvtk9: package-name-doesnt-match-sonames

diff --git a/debian/libvtk9.install b/debian/libvtk9.install
deleted file mode 100644 (file)
index 47de4b0..0000000
--- a/debian/libvtk9.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/*.so.*
-usr/lib/*/vtk

diff --git a/debian/libvtk9.lintian-overrides b/debian/libvtk9.lintian-overrides
deleted file mode 100644 (file)
index 85c26f1..0000000
--- a/debian/libvtk9.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libvtk9: package-name-doesnt-match-sonames

diff --git a/debian/rules b/debian/rules
index ee2c8b0440ca03b18b4954b9fbfbdf4e485733bc..58ea95f129bdada4ad813abf0bdc2f3dad421bb0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -105,7 +105,7 @@ execute_after_dh_install:
        find $(CURDIR)/debian/libvtk9-dev/ -name "*Qt*" -exec rm {} \; || true
        find $(CURDIR)/debian/libvtk9-dev/ -name "libvtkRenderingPythonTkWidgets.so" -exec rm {} \; || true
        find $(CURDIR)/debian/libvtk9-dev/usr/include/ -name "Q*" -exec rm {} \; || true
-       find $(CURDIR)/debian/libvtk9/ -name "*Qt*" -exec rm {} \; || true
+       find $(CURDIR)/debian/libvtk9.1/ -name "*Qt*" -exec rm {} \; || true
        find $(CURDIR)/debian/tmp/usr/share/doc/vtk-9.0/doxygen -name "_formulas.log" -exec rm {} \; || true
        find $(CURDIR)/debian/build/Utilities/Doxygen/doc/html -name "_formulas.log" -exec rm {} \; || true